Implement has_pending and queue_events vfuncs for quartz

diff --git a/gdk/quartz/gdkdisplay-quartz.c b/gdk/quartz/gdkdisplay-quartz.c
index 162569c343a3ecc1853e08a6e0a52c2650021033..f3a87a2ae372a80f4ea360684e2b2b337cb76af7 100644 (file)
--- a/gdk/quartz/gdkdisplay-quartz.c
+++ b/gdk/quartz/gdkdisplay-quartz.c
@@ -227,6 +227,8 @@ _gdk_display_quartz_class_init (GdkDisplayQuartz *class)
   display_class->beep = gdk_quartz_display_beep;
   display_class->sync = _gdk_quartz_display_sync;
   display_class->flush = _gdk_quartz_display_flush;
+  display_class->queue_events = _gdk_quartz_display_queue_events;
+  display_class->has_pending = _gdk_quartz_display_has_pending;
   display_class->get_default_group = gdk_quartz_display_get_default_group;
   display_class->supports_selection_notification = gdk_quartz_display_supports_selection_notification;
   display_class->request_selection_notification = gdk_quartz_display_request_selection_notification;

diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c
index 75ead8b9a3335d637077ba19843cea62ed957f40..026b75143da5faafa437cae78a2196af65612933 100644 (file)
--- a/gdk/quartz/gdkevents-quartz.c
+++ b/gdk/quartz/gdkevents-quartz.c
@@ -68,10 +68,10 @@ _gdk_quartz_events_init (void)
 }
 
 gboolean
-gdk_events_pending (void)
+_gdk_quartz_display_has_pending (GdkDisplay *display)
 {
-  return (_gdk_event_queue_find_first (_gdk_display) ||
-         (_gdk_quartz_event_loop_check_pending ()));
+  return (_gdk_event_queue_find_first (display) ||
+         (_gdk_quartz_event_loop_check_pending ()));
 }
 
 static void
@@ -1296,7 +1296,7 @@ gdk_event_translate (GdkEvent *event,
 }
 
 void
-_gdk_events_queue (GdkDisplay *display)
+_gdk_quartz_display_queue_events (GdkDisplay *display)
 {  
   NSEvent *nsevent;
 

diff --git a/gdk/quartz/gdkprivate-quartz.h b/gdk/quartz/gdkprivate-quartz.h
index bebf02cc3e568b55ede11e14d187044fabf02e22..0cb56db27c2af60cbae0443d64257eb835d7eced 100644 (file)
--- a/gdk/quartz/gdkprivate-quartz.h
+++ b/gdk/quartz/gdkprivate-quartz.h
@@ -149,9 +149,11 @@ GdkDragContext * _gdk_quartz_window_drag_begin   (GdkWindow   *window,
                                                   GList       *targets);
 
 
-void        _gdk_quartz_display_sync                (GdkDisplay  *display);
-void        _gdk_quartz_display_flush               (GdkDisplay  *display);
-GList *     _gdk_quartz_display_list_devices        (GdkDisplay  *dpy);
+void     _gdk_quartz_display_sync         (GdkDisplay *display);
+void     _gdk_quartz_display_flush        (GdkDisplay *display);
+GList *  _gdk_quartz_display_list_devices (GdkDisplay *display);
+void     _gdk_quartz_display_queue_events (GdkDisplay *display);
+gboolean _gdk_quartz_display_has_pending  (GdkDisplay *display);
 
 GdkDisplay *    _gdk_quartz_display_open (const gchar *name);